debian/copyright: fix the diy2 license

diff --git a/debian/copyright b/debian/copyright
index 4802dfd25464c2230cf0b24688353063266d62b7..ff39b20ba74cf7c0c8ba72167f675e0391654f85 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -72,10 +72,11 @@ Copyright: Ken Martin, Will Schroeder, Bill Lorensen
 License: Apache-2
 
 Files: ThirdParty/diy2/vtkdiy2/*
-Copyright: 2016-2018, Chobolabs Inc.
-License: BSD-3-clause
+Copyright: 2015, The Regents of the University of California, through
+ Lawrence Berkeley National Laboratory
+License: BSD-3-clause-LBNL
 
-Files: ThirdParty/diy2/vtkdiy2/include/vtkdiy2/fmt/*
+Files: ThirdParty/diy2/vtkdiy2/include/vtkdiy2/thirdparty/fmt/*
 Copyright: 2012-2016, Victor Zverovich
 License: BSD-like
   Permission is hereby granted, free of charge, to any person obtaining
@@ -104,6 +105,16 @@ License: BSD-like
   source code, you may redistribute such embedded portions in such object form
   without including the above copyright and permission notices.
 
+Files: ThirdParty/diy2/vtkdiy2/include/vtkdiy2/thirdparty/itlib/*
+Copyright:
+ 2016-2018 Chobolabs Inc.
+ 2020-2022 Borislav Stanimirov
+License: MIT
+
+Files: ThirdParty/diy2/vtkdiy2/include/vtkdiy2/thirdparty/thread/*
+Copyright: 2010-2012 Marcus Geelnard
+License: zlib
+
 Files:
  ThirdParty/glad/vtkglad/include/EGL/eglplatform.h
  ThirdParty/glad/vtkglad/include/KHR/khrplatform.h
@@ -141,7 +152,7 @@ Copyright: 2006-2016, Arseny Kapoulkine
 License: Expat
 
 Files: ThirdParty/token/vtktoken/*
-?Copyright: 2020-2023, Kitware, Inc.
+Copyright: 2020-2023, Kitware, Inc.
 License: BSD-3-clause
 
 Files: ThirdParty/vpic/*
@@ -470,3 +481,39 @@ License: BSD-3-clause-notice-2
   other computer software, distribute, and sublicense such enhancements or
   derivative works thereof, in binary and source code form.
 
+License: BSD-3-clause-LBNL
+  Redistribution and use in source and binary forms, with or without modification,
+  are permitted provided that the following conditions are met:
+  .
+  (1) Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+  .
+  (2) Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+  .
+  (3) Neither the name of the University of California, Lawrence Berkeley National
+  Laboratory, U.S. Dept. of Energy nor the names of its contributors may be used
+  to endorse or promote products derived from this software without specific prior
+  written permission.
+  .
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  .
+  You are under no obligation whatsoever to provide any bug fixes, patches, or
+  upgrades to the features, functionality or performance of the source code
+  ("Enhancements") to anyone; however, if you choose to make your Enhancements
+  available either publicly, or directly to Lawrence Berkeley National Laboratory,
+  without imposing a separate written license agreement for such Enhancements,
+  then you hereby grant the following license: a  non-exclusive, royalty-free
+  perpetual license to install, use, modify, prepare derivative works, incorporate
+  into other computer software, distribute, and sublicense such enhancements or
+  derivative works thereof, in binary and source code form.